|
|
@@ -192,7 +192,7 @@ def upload_temperature(request):
|
192
|
192
|
ThermometerMeasureLogInfo.objects.create(point_id=eqpt.point_id, macid=macid, name=name, sex=sex, birth_stamp=birth_stamp, phone=phone, start_stamp=start_stamp, end_stamp=end_stamp, temperature=temperature, upload_temperature_info=request.POST)
|
193
|
193
|
|
194
|
194
|
if point_measure_window:
|
195
|
|
- measure_info = ThermometerMeasureInfo.objects.get_or_create(point_id=eqpt.point_id, point_measure_ymd=point_measure_ymd, point_measure_window=point_measure_window, macid=macid, defaults={
|
|
195
|
+ measure_info, _ = ThermometerMeasureInfo.objects.get_or_create(point_id=eqpt.point_id, point_measure_ymd=point_measure_ymd, point_measure_window=point_measure_window, macid=macid, defaults={
|
196
|
196
|
'temperature': temperature,
|
197
|
197
|
})
|
198
|
198
|
if temperature > measure_info.temperature:
|
|
|
@@ -259,7 +259,7 @@ def mqtt_upload_temperature(payload):
|
259
|
259
|
ThermometerMeasureLogInfo.objects.create(point_id=eqpt.point_id, macid=macid, start_stamp=start_stamp, end_stamp=end_stamp, temperature=temperature, temperature_src=ThermometerMeasureLogInfo.MQTT, upload_temperature_info=payload)
|
260
|
260
|
|
261
|
261
|
if point_measure_window:
|
262
|
|
- measure_info = ThermometerMeasureInfo.objects.get_or_create(point_id=eqpt.point_id, point_measure_ymd=point_measure_ymd, point_measure_window=point_measure_window, macid=macid, defaults={
|
|
262
|
+ measure_info, _ = ThermometerMeasureInfo.objects.get_or_create(point_id=eqpt.point_id, point_measure_ymd=point_measure_ymd, point_measure_window=point_measure_window, macid=macid, defaults={
|
263
|
263
|
'temperature': temperature,
|
264
|
264
|
})
|
265
|
265
|
if temperature > measure_info.temperature:
|